9d366ee9d7289ec98483f0082aed94cb79fe364f,htroot/ViewLog_p.java,ViewLog_p,respond,#RequestHeader#serverObjects#serverSwitch#,46
Before Change
filter = post.get("filter");
}
if(post.containsKey("json")){
json = true;
}
}
final Logger logger = Logger.getLogger("");
final Handler[] handlers = logger.getHandlers();
boolean displaySubmenu = false;
for (int i=0; i<handlers.length; i++) {
if (handlers[i] instanceof GuiHandler) {
maxlines = ((GuiHandler)handlers[i]).getSize();
if (lines > maxlines) lines = maxlines;
log = ((GuiHandler)handlers[i]).getLogLines(reversed,lines);
} else if (handlers[i] instanceof LogalizerHandler) {
displaySubmenu = true;
}
}
prop.put("submenu", displaySubmenu ? "1" : "0");
prop.put("reverseChecked", reversed ? "1" : "0");
prop.put("lines", lines);
prop.put("maxlines",maxlines);
prop.putHTML("filter", filter);
// trying to compile the regular expression filter expression
Matcher filterMatcher = null;
try {
final Pattern filterPattern = Pattern.compile(filter,Pattern.MULTILINE);
filterMatcher = filterPattern.matcher("");
} catch (final PatternSyntaxException e) {
Log.logException(e);
}
int level = 0;
int lc = 0;
for (int i=0; i < log.length; i++) {
final String nextLogLine = log[i].trim();
if (filterMatcher != null) {
filterMatcher.reset(nextLogLine);
if (!filterMatcher.find()) continue;
}
if (nextLogLine.startsWith("E ")) level = 4;
else if (nextLogLine.startsWith("W ")) level = 3;
else if (nextLogLine.startsWith("S ")) level = 2;
else if (nextLogLine.startsWith("I ")) level = 1;
else if (nextLogLine.startsWith("D ")) level = 0;
prop.put("log_" + lc + "_level", level);
if (json) prop.putJSON("log_" + lc + "_line", nextLogLine);
else prop.put("log_" + lc + "_line", nextLogLine);
lc++;
}
After Change
if(post != null){
reversed = (post.containsKey("mode") && (post.get("mode")).equals("reversed"));
json = post.containsKey("json");
if(post.containsKey("lines")){
lines = Integer.parseInt(post.get("lines"));
}
if(post.containsKey("filter")){
filter = post.get("filter");
}
}
final Logger logger = Logger.getLogger("");
final Handler[] handlers = logger.getHandlers();
for (final Handler handler : handlers) {
if (handler instanceof GuiHandler) {
maxlines = ((GuiHandler)handler).getSize();
if (lines > maxlines) lines = maxlines;
log = ((GuiHandler)handler).getLogLines(reversed,lines);
}
}
prop.put("reverseChecked", reversed ? "1" : "0");
prop.put("lines", lines);
prop.put("maxlines",maxlines);
prop.putHTML("filter", filter);
// trying to compile the regular expression filter expression
Matcher filterMatcher = null;
try {
final Pattern filterPattern = Pattern.compile(filter,Pattern.MULTILINE);
filterMatcher = filterPattern.matcher("");
} catch (final PatternSyntaxException e) {
Log.logException(e);
}
int level = 0;
int lc = 0;
for (final String logLine : log) {
final String nextLogLine = logLine.trim();
if (filterMatcher != null) {
filterMatcher.reset(nextLogLine);
if (!filterMatcher.find()) continue;
}
if (nextLogLine.startsWith("E ")) {
level = 4;
} else if (nextLogLine.startsWith("W ")) {
level = 3;
} else if (nextLogLine.startsWith("S ")) {
level = 2;
} else if (nextLogLine.startsWith("I ")) {
level = 1;
} else if (nextLogLine.startsWith("D ")) {
level = 0;
}
prop.put("log_" + lc + "_level", level);
if (json) {
prop.putJSON("log_" + lc + "_line", nextLogLine);
} else {
prop.put("log_" + lc + "_line", nextLogLine);
}